From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 11 Jul 2008 11:43:33 +0000 (+0100)
Subject: tapdisk: in case O_DIRECT fails, retry again with o_flags but
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14188^2~47
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=1d36727c99ccd86b9b6a92723f4a2964dca82510;p=xen.git

tapdisk: in case O_DIRECT fails, retry again with o_flags but
O_DIRECT, instead of fixed value O_RD_WR | O_LARGEFILE

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
---

diff --git a/tools/blktap/drivers/block-sync.c b/tools/blktap/drivers/block-sync.c
index 8e6697c329..baa78a377f 100644
--- a/tools/blktap/drivers/block-sync.c
+++ b/tools/blktap/drivers/block-sync.c
@@ -129,7 +129,7 @@ int tdsync_open (struct disk_driver *dd, const char *name, td_flag_t flags)
 
                 /* Maybe O_DIRECT isn't supported. */
 		o_flags &= ~O_DIRECT;
-                fd = open(name, O_RDWR | O_LARGEFILE);
+                fd = open(name, o_flags);
                 if (fd != -1) DPRINTF("WARNING: Accessing image without"
                                      "O_DIRECT! (%s)\n", name);